From 6f9cc94fae39726d08729b52eb29b59e0c8b4ce3 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 16 Jan 2012 18:44:43 +0100 Subject: [PATCH] cssprovider: Improve error handling for import errors We don't want to include the whitespace after an import statement. Because people tend to add newlines after @import, we report the wrong lines for failed imports. And that's bad. --- gtk/gtkcssprovider.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 462b551d41..5285d29a3f 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -1790,7 +1790,7 @@ parse_import (GtkCssScanner *scanner) return TRUE; } - if (!_gtk_css_parser_try (scanner->parser, ";", TRUE)) + if (!_gtk_css_parser_try (scanner->parser, ";", FALSE)) { gtk_css_provider_invalid_token (scanner->provider, scanner, "semicolon"); _gtk_css_parser_resync (scanner->parser, TRUE, 0); @@ -1818,6 +1818,8 @@ parse_import (GtkCssScanner *scanner) g_object_unref (file); gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT); + _gtk_css_parser_skip_whitespace (scanner->parser); + return TRUE; } -- 2.30.2